Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

add ?ts massaging for ASes #2754

Merged
merged 2 commits into from
Jan 23, 2018
Merged

add ?ts massaging for ASes #2754

merged 2 commits into from
Jan 23, 2018

Conversation

ara4n
Copy link
Member

@ara4n ara4n commented Jan 4, 2018

No description provided.

@ara4n ara4n changed the base branch from master to develop January 4, 2018 19:11
@erikjohnston
Copy link
Member

erikjohnston commented Jan 4, 2018 •
edited by MadLittleMods
Loading

Looks like it does the right think and doesn't clobber: https://github.com/matrix-org/synapse/blob/master/synapse/events/builder.py#L68

synapse/synapse/events/builder.py

Line 68 in 5ea4d5d

key_values.setdefault("origin_server_ts", time_now)

@ara4n
Copy link
Member Author

ara4n commented Jan 7, 2018

@erikjohnston ptal

@erikjohnston
Copy link
Member

The travis merged pr CI failure is due to the tests being broken on develop.

@erikjohnston erikjohnston assigned ara4n and unassigned erikjohnston Jan 9, 2018
@ara4n ara4n merged commit d323853 into develop Jan 23, 2018
This was referenced Jan 30, 2021
Open
Merged
This was referenced Apr 13, 2023
Open
Open
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@erikjohnston erikjohnston erikjohnston approved these changes

Assignees

@ara4n ara4n

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ara4n @erikjohnston